Every Change Needed To Fix Sod Classes - Sod Phase 2